css: Add gtk_css_number_value_can_parse()

Use it instead of _gtk_css_parser_has_number().

We need that once we introduce calc() support.

diff --git a/gtk/gtkcssbgsizevalue.c b/gtk/gtkcssbgsizevalue.c
index 54bbea42fd7b016cc25667d6b846cbe81cccde61..b5da0677d0b1f7b66c524835ebb64f7232143ee9 100644 (file)
--- a/gtk/gtkcssbgsizevalue.c
+++ b/gtk/gtkcssbgsizevalue.c
@@ -194,7 +194,7 @@ _gtk_css_bg_size_value_parse (GtkCssParser *parser)
 
   if (_gtk_css_parser_try (parser, "auto", TRUE))
     y = NULL;
-  else if (!_gtk_css_parser_has_number (parser))
+  else if (!gtk_css_number_value_can_parse (parser))
     y = NULL;
   else
     {

diff --git a/gtk/gtkcssbordervalue.c b/gtk/gtkcssbordervalue.c
index 7161470063f98041975b6a37d16a77ad376b17ef..0b68d86f7adb656a582b33cd2bd25b768cde107f 100644 (file)
--- a/gtk/gtkcssbordervalue.c
+++ b/gtk/gtkcssbordervalue.c
@@ -174,7 +174,7 @@ _gtk_css_border_value_parse (GtkCssParser           *parser,
       if (allow_auto && _gtk_css_parser_try (parser, "auto", TRUE))
         continue;
 
-      if (!_gtk_css_parser_has_number (parser))
+      if (!gtk_css_number_value_can_parse (parser))
         break;
 
       result->values[i] = _gtk_css_number_value_parse (parser, flags);

diff --git a/gtk/gtkcsscornervalue.c b/gtk/gtkcsscornervalue.c
index 0511ca496da88f3ac4c91b5a53b166694c625a95..c4ef38d94d6652848c24cb8dc9a7595a3f44c14a 100644 (file)
--- a/gtk/gtkcsscornervalue.c
+++ b/gtk/gtkcsscornervalue.c
@@ -132,7 +132,7 @@ _gtk_css_corner_value_parse (GtkCssParser *parser)
   if (x == NULL)
     return NULL;
 
-  if (!_gtk_css_parser_has_number (parser))
+  if (!gtk_css_number_value_can_parse (parser))
     y = _gtk_css_value_ref (x);
   else
     {

diff --git a/gtk/gtkcssimagecrossfade.c b/gtk/gtkcssimagecrossfade.c
index 1b02af94f73f5e8b6d1cd37f7587d38af3c12346..6677e400f9e0127ba75c4bb361186048e98f18d7 100644 (file)
--- a/gtk/gtkcssimagecrossfade.c
+++ b/gtk/gtkcssimagecrossfade.c
@@ -163,7 +163,7 @@ gtk_css_image_cross_fade_parse (GtkCssImage  *image,
       return FALSE;
     }
 
-  if (_gtk_css_parser_has_number (parser))
+  if (gtk_css_number_value_can_parse (parser))
     {
       GtkCssValue *number;
       

diff --git a/gtk/gtkcssimagelinear.c b/gtk/gtkcssimagelinear.c
index 6b8ff2a8daad35a221b688b0c3eb3f177d7931ef..b4a53f563362578176b92045a9f25a108294fe6a 100644 (file)
--- a/gtk/gtkcssimagelinear.c
+++ b/gtk/gtkcssimagelinear.c
@@ -310,7 +310,7 @@ gtk_css_image_linear_parse (GtkCssImage  *image,
           return FALSE;
         }
     }
-  else if (_gtk_css_parser_has_number (parser))
+  else if (gtk_css_number_value_can_parse (parser))
     {
       linear->angle = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_ANGLE);
       if (linear->angle == NULL)
@@ -332,7 +332,7 @@ gtk_css_image_linear_parse (GtkCssImage  *image,
     if (stop.color == NULL)
       return FALSE;
 
-    if (_gtk_css_parser_has_number (parser))
+    if (gtk_css_number_value_can_parse (parser))
       {
         stop.offset = _gtk_css_number_value_parse (parser,
                                                    GTK_CSS_PARSE_PERCENT

diff --git a/gtk/gtkcssimageradial.c b/gtk/gtkcssimageradial.c
index 8febdc4d397e09457264ad1bf18ab9523f24a14e..bc137db7da226c9e278de0a31d7329df9875a042 100644 (file)
--- a/gtk/gtkcssimageradial.c
+++ b/gtk/gtkcssimageradial.c
@@ -282,9 +282,9 @@ gtk_css_image_radial_parse (GtkCssImage  *image,
 
         if (!has_size)
           {
-            if (_gtk_css_parser_has_number (parser))
+            if (gtk_css_number_value_can_parse (parser))
               radial->sizes[0] = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH | GTK_CSS_PARSE_PERCENT);
-            if (_gtk_css_parser_has_number (parser))
+            if (gtk_css_number_value_can_parse (parser))
               radial->sizes[1] = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH | GTK_CSS_PARSE_PERCENT);
             found_one = has_size = radial->sizes[0] != NULL;
           }
@@ -357,7 +357,7 @@ gtk_css_image_radial_parse (GtkCssImage  *image,
     if (stop.color == NULL)
       return FALSE;
 
-    if (_gtk_css_parser_has_number (parser))
+    if (gtk_css_number_value_can_parse (parser))
       {
         stop.offset = _gtk_css_number_value_parse (parser,
                                                    GTK_CSS_PARSE_PERCENT

diff --git a/gtk/gtkcssnumbervalue.c b/gtk/gtkcssnumbervalue.c
index a766a631b5709b59920134137e2c723e352c914d..05643d7364c851d9bdf6f98485c2237ac52a43c4 100644 (file)
--- a/gtk/gtkcssnumbervalue.c
+++ b/gtk/gtkcssnumbervalue.c
@@ -48,6 +48,12 @@ _gtk_css_number_value_new (double     value,
   return gtk_css_dimension_value_new (value, unit);
 }
 
+gboolean
+gtk_css_number_value_can_parse (GtkCssParser *parser)
+{
+  return _gtk_css_parser_has_number (parser);
+}
+
 GtkCssValue *
 _gtk_css_number_value_parse (GtkCssParser           *parser,
                              GtkCssNumberParseFlags  flags)

diff --git a/gtk/gtkcssnumbervalueprivate.h b/gtk/gtkcssnumbervalueprivate.h
index dec0f080adf0028330c7d219fcc7cfb8cce0e1d0..e45eeaaaa8e82f65942546ef9f708b532a3ebc0a 100644 (file)
--- a/gtk/gtkcssnumbervalueprivate.h
+++ b/gtk/gtkcssnumbervalueprivate.h
@@ -49,6 +49,7 @@ struct _GtkCssNumberValueClass {
 
 GtkCssValue *   _gtk_css_number_value_new           (double                  value,
                                                      GtkCssUnit              unit);
+gboolean        gtk_css_number_value_can_parse      (GtkCssParser           *parser);
 GtkCssValue *   _gtk_css_number_value_parse         (GtkCssParser           *parser,
                                                      GtkCssNumberParseFlags  flags);
 

diff --git a/gtk/gtkcsspositionvalue.c b/gtk/gtkcsspositionvalue.c
index 6a52ff6c475bec126007cc4399d4e0a6815635f2..9102b16bb083e44e469268be556fcb21c1cc1c88 100644 (file)
--- a/gtk/gtkcsspositionvalue.c
+++ b/gtk/gtkcsspositionvalue.c
@@ -210,7 +210,7 @@ position_value_parse (GtkCssParser *parser, gboolean try)
     }
   if (names[first].name == NULL)
     {
-      if (_gtk_css_parser_has_number (parser))
+      if (gtk_css_number_value_can_parse (parser))
         {
           missing = &y;
           x = _gtk_css_number_value_parse (parser,
@@ -239,7 +239,7 @@ position_value_parse (GtkCssParser *parser, gboolean try)
 
   if (names[second].name == NULL)
     {
-      if (_gtk_css_parser_has_number (parser))
+      if (gtk_css_number_value_can_parse (parser))
         {
           if (missing != &y)
             {

diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c
index c9a02a014c1906b02f70ec11f6bc792012ea6b52..a1237e563030efc93410d97fc924511830ddaf5d 100644 (file)
--- a/gtk/gtkcssshadowvalue.c
+++ b/gtk/gtkcssshadowvalue.c
@@ -215,7 +215,7 @@ _gtk_css_shadow_value_parse (GtkCssParser *parser,
   do
   {
     if (values[HOFFSET] == NULL &&
-         _gtk_css_parser_has_number (parser))
+        gtk_css_number_value_can_parse (parser))
       {
         values[HOFFSET] = _gtk_css_number_value_parse (parser,
                                                        GTK_CSS_PARSE_LENGTH
@@ -229,7 +229,7 @@ _gtk_css_shadow_value_parse (GtkCssParser *parser,
         if (values[VOFFSET] == NULL)
           goto fail;
 
-        if (_gtk_css_parser_has_number (parser))
+        if (gtk_css_number_value_can_parse (parser))
           {
             values[RADIUS] = _gtk_css_number_value_parse (parser,
                                                           GTK_CSS_PARSE_LENGTH
@@ -241,7 +241,7 @@ _gtk_css_shadow_value_parse (GtkCssParser *parser,
         else
           values[RADIUS] = _gtk_css_number_value_new (0.0, GTK_CSS_PX);
 
-        if (box_shadow_mode && _gtk_css_parser_has_number (parser))
+        if (box_shadow_mode && gtk_css_number_value_can_parse (parser))
           {
             values[SPREAD] = _gtk_css_number_value_parse (parser,
                                                           GTK_CSS_PARSE_LENGTH

diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c
index f10a180d3a11e20bc71dc261dc59f399d3d17c61..27ff25b9a467e2a872b09852413e3fda4892d4a5 100644 (file)
--- a/gtk/gtkcssshorthandpropertyimpl.c
+++ b/gtk/gtkcssshorthandpropertyimpl.c
@@ -68,7 +68,7 @@ parse_four_numbers (GtkCssShorthandProperty  *shorthand,
 
   for (i = 0; i < 4; i++)
     {
-      if (!_gtk_css_parser_has_number (parser))
+      if (!gtk_css_number_value_can_parse (parser))
         break;
 
       values[i] = _gtk_css_number_value_parse (parser, flags);
@@ -138,7 +138,7 @@ parse_border_radius (GtkCssShorthandProperty  *shorthand,
 
   for (i = 0; i < 4; i++)
     {
-      if (!_gtk_css_parser_has_number (parser))
+      if (!gtk_css_number_value_can_parse (parser))
         break;
       x[i] = _gtk_css_number_value_parse (parser,
                                           GTK_CSS_POSITIVE_ONLY
@@ -165,7 +165,7 @@ parse_border_radius (GtkCssShorthandProperty  *shorthand,
     {
       for (i = 0; i < 4; i++)
         {
-          if (!_gtk_css_parser_has_number (parser))
+          if (!gtk_css_number_value_can_parse (parser))
             break;
           y[i] = _gtk_css_number_value_parse (parser,
                                               GTK_CSS_POSITIVE_ONLY
@@ -335,7 +335,7 @@ parse_border_side (GtkCssShorthandProperty  *shorthand,
   do
   {
     if (values[0] == NULL &&
-         _gtk_css_parser_has_number (parser))
+        gtk_css_number_value_can_parse (parser))
       {
         values[0] = _gtk_css_number_value_parse (parser,
                                                  GTK_CSS_POSITIVE_ONLY
@@ -377,7 +377,7 @@ parse_border (GtkCssShorthandProperty  *shorthand,
   do
   {
     if (values[0] == NULL &&
-         _gtk_css_parser_has_number (parser))
+        gtk_css_number_value_can_parse (parser))
       {
         values[0] = _gtk_css_number_value_parse (parser,
                                                  GTK_CSS_POSITIVE_ONLY
@@ -620,7 +620,7 @@ parse_one_transition (GtkCssShorthandProperty  *shorthand,
     {
       /* the image part */
       if (values[2] == NULL &&
-          _gtk_css_parser_has_number (parser) && !_gtk_css_parser_begins_with (parser, '-'))
+          gtk_css_number_value_can_parse (parser) && !_gtk_css_parser_begins_with (parser, '-'))
         {
           GtkCssValue *number = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_TIME);
 
@@ -725,7 +725,7 @@ parse_one_animation (GtkCssShorthandProperty  *shorthand,
           values[1] = _gtk_css_number_value_new (HUGE_VAL, GTK_CSS_NUMBER);
         }
       else if ((values[1] == NULL || values[3] == NULL) &&
-          _gtk_css_parser_has_number (parser))
+               gtk_css_number_value_can_parse (parser))
         {
           GtkCssValue *value;